[Bug 4150] New: Merge conflict not happening where expected
mercurial-bugs at selenic.com
mercurial-bugs at selenic.com
Thu Jan 23 07:24:58 CST 2014
http://bz.selenic.com/show_bug.cgi?id=4150
Priority: normal
Bug ID: 4150
CC: mercurial-devel at selenic.com
Assignee: bugzilla at selenic.com
Summary: Merge conflict not happening where expected
Severity: bug
Classification: Unclassified
OS: Windows
Reporter: d155601 at drdrb.com
Hardware: PC
Status: UNCONFIRMED
Version: 2.8.2
Component: Mercurial
Product: Mercurial
c:\hg>hg init
c:\hg>hg add
adding general.css
c:\hg>hg d
diff --git a/general.css b/general.css
new file mode 100644
--- /dev/null
+++ b/general.css
@@ -0,0 +1,73 @@
+body {
+ margin: 0px;
+ text-align: center;
+ font-family: Verdana, Tahoma;
+ font-size: 10pt;
+}
+
+nav {
+ margin-top: 6px;
+ font-size: 9pt;
+}
+
+nav ul {
+ margin: 0px;
+ padding: 0px;
+}
+
+nav li {
+ display: inline-block;
+ padding: 2px 6px;
+ border-right: 1px solid black;
+}
+
+nav li:last-child {
+ border: 0px;
+}
+
+a {
+ color: blue;
+ text-decoration: none;
+}
+
+a:hover {
+ text-decoration: underline;
+}
+
+section {
+ display: inline-block;
+ margin: 0px 16px 24px 16px;
+}
+
+h1 {
+ font-size: 16pt;
+}
+
+table {
+ border-collapse: collapse;
+}
+
+th, td {
+ border: 1px solid gray;
+ padding: 4px 8px;
+}
+
+td {
+ text-align: left; /* counter body's text-align */
+}
+
+td.number, td.date, td.length {
+ text-align: right;
+}
+
+td.date, td.length {
+ font-style: italic;
+}
+
+td a {
+ color: inherit;
+}
+
+td a:hover {
+ color: blue;
+}
c:\hg>hg ci -m "Add file"
### MAKE CHANGES ###
c:\hg>hg d
diff --git a/general.css b/general.css
--- a/general.css
+++ b/general.css
@@ -34,11 +34,6 @@
text-decoration: underline;
}
-section {
- display: inline-block;
- margin: 0px 16px 24px 16px;
-}
-
h1 {
font-size: 16pt;
}
c:\hg>hg ci -m "Remove section"
c:\hg>hg up 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
### MAKE CHANGES ###
c:\hg>hg d
diff --git a/general.css b/general.css
--- a/general.css
+++ b/general.css
@@ -36,6 +36,7 @@
section {
display: inline-block;
+ new line
margin: 0px 16px 24px 16px;
}
c:\hg>hg ci -m "Add new line"
created new head
c:\hg>hg merge
merging general.css
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
c:\hg>hg d
diff --git a/general.css b/general.css
--- a/general.css
+++ b/general.css
@@ -34,12 +34,7 @@
text-decoration: underline;
}
-section {
- display: inline-block;
new line
- margin: 0px 16px 24px 16px;
-}
-
h1 {
font-size: 16pt;
}
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list