| commit | af27af8e1c57b9802160060156e59742dfe4e0ba | |
| author | Yann Dirson <yann.dirson@sagem.com> | |
| Tue, 24 Jul 2007 18:57:30 +0000 (24 20:57 +0200) | ||
| committer | Catalin Marinas <catalin.marinas@gmail.com> | |
| Tue, 24 Jul 2007 22:47:08 +0000 (24 23:47 +0100) | ||
| tree | 7d0da701c8d2ba9e946a39fec09dbb7dd72fab68 | treesnapshot (tar.gz zip) |
| parent | 501d024430ebad7e010362cc60f73713da6e787e | commitdiff |
Fix stg-whatchanged to deal with conflicts already solved.
The most reliable way I found to decide if we were in the process of
solving a conflict, including when all conflicted files have already
been marked resolved, is to check the latest patchlog entry.
Signed-off-by: Yann Dirson <ydirson@altern.org>
The most reliable way I found to decide if we were in the process of
solving a conflict, including when all conflicted files have already
been marked resolved, is to check the latest patchlog entry.
Signed-off-by: Yann Dirson <ydirson@altern.org>
| contrib/stg-whatchanged | diffblobblamehistory |