~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 774fc1e) | patch
Fix the added to both but different conflict
authorCatalin Marinas <catalin.marinas@gmail.com>
Wed, 3 May 2006 19:34:18 +0000 (20:34 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 3 May 2006 19:34:18 +0000 (20:34 +0100)
commit56df21ed4cf5230924b5b6bd69b138da904758d0
treeecd55bffad4d8692d175dd50df9e60179e45cfb0tree | snapshot (tar.gz zip)
parent774fc1e90859cc68926f4357347b0624d43f746fcommit | diff
Fix the added to both but different conflict

By default, the index was left with two unmerged entries. StGIT tries to
leave the index clean after conflicts.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/gitmergeonefile.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)