> git --version
git version 1.7.12.4
> git init
Initialized empty Git repository in /Users/habnabit/test/git/.git/
> echo A > file
> git add file
> git ci -m 'Add file with A'
[master (root-commit) cdb6c33] Add file with A
 1 file changed, 1 insertion(+)
 create mode 100644 file
> git branch b
> echo A B > file
> git diff
diff --git a/file b/file
index f70f10e..5decc2b 100644
--- a/file
+++ b/file
@@ -1 +1 @@
-A
+A B
> git ca -m 'Add B to file'
[master a5f9613] Add B to file
 1 file changed, 1 insertion(+), 1 deletion(-)
> git checkout b
Switched to branch 'b'
> echo 'A C' > file
> git diff
diff --git a/file b/file
index f70f10e..bec281d 100644
--- a/file
+++ b/file
@@ -1 +1 @@
-A
+A C
> git ca -m 'Add C to file'
[b 92e1267] Add C to file
 1 file changed, 1 insertion(+), 1 deletion(-)
> git checkout master
Switched to branch 'master'
> git merge b
Auto-merging file
CONFLICT (content): Merge conflict in file
Recorded preimage for 'file'
Automatic merge failed; fix conflicts and then commit the result.
> git diff
diff --cc file
index 5decc2b,bec281d..0000000
--- a/file
+++ b/file
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +A B
++=======
+ A C
++>>>>>>> b
> echo 'A C' > file
> git ca -m 'Merge b into master'
Recorded resolution for 'file'.
[master 1d3e843] Merge b into master
> git log -p -SB
commit a5f9613769173f649e4a4eb7fb7885648d0344bb
Author: Aaron Gallagher <habnabit@gmail.com>
Date:   Fri Oct 19 16:53:33 2012 -0700

    Add B to file

diff --git a/file b/file
index f70f10e..5decc2b 100644
--- a/file
+++ b/file
@@ -1 +1 @@
-A
+A B