~mdw / stgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: 56df21e)
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)
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>

No differences found
GIT patch-maintenance porcelain (local modifications)