Merge pull request #1190 from nulltoken/topic/reset-paths

author Russell Belfer <rb@github.com>

Mon, 11 Feb 2013 19:44:00 +0000 (11:44 -0800)

committer Russell Belfer <rb@github.com>

Mon, 11 Feb 2013 19:44:00 +0000 (11:44 -0800)
author Russell Belfer <rb@github.com>
Mon, 11 Feb 2013 19:44:00 +0000 (11:44 -0800)
committer Russell Belfer <rb@github.com>
Mon, 11 Feb 2013 19:44:00 +0000 (11:44 -0800)
diff --cc src/branch.c
Simple merge
diff --cc src/index.c
Simple merge
author	Russell Belfer <rb@github.com>
	Mon, 11 Feb 2013 19:44:00 +0000 (11:44 -0800)
committer	Russell Belfer <rb@github.com>
	Mon, 11 Feb 2013 19:44:00 +0000 (11:44 -0800)
		1	2
src/branch.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/index.c	patch \|	diff1 \|	diff2 \|	blob \| history